Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XEH - Move compats to individual addons #1589

Merged
merged 8 commits into from
Sep 6, 2023
Merged

XEH - Move compats to individual addons #1589

merged 8 commits into from
Sep 6, 2023

Conversation

PabstMirror
Copy link
Contributor

@PabstMirror PabstMirror commented Jul 26, 2023

ref #1587
get rid of werid scope = "parseNumber stuff
no added entries entries

it does add to mission.sqm (addonRootClass just doesn't work?)

addons[]={"objects_f_vietnam_c", "cba_ee_compat_sog" };

normally just adds cba_xeh, which isn't much different imho

@BrettMayson
Copy link
Contributor

Should this not be possible more cleanly with skipWhenMissingDependencies?

@PabstMirror
Copy link
Contributor Author

skipWhenMissingDependencies will be a drop-in thing

e.g. for compat_contact/config.cpp just remove lines 5-12 and the last endif

@BrettMayson
Copy link
Contributor

I guess it depends on if there will be a CBA release before then

@PabstMirror PabstMirror marked this pull request as ready for review August 20, 2023 17:25
@PabstMirror
Copy link
Contributor Author

tested on 2.14 with skipWhen and everything works as expected

Skipped loading of addon 'cba_ee_compat_contact' as required addon 'A3_Data_F_Contact' is not present
Skipped loading of addon 'cba_ee_compat_csla' as required addon 'CSLA' is not present
Skipped loading of addon 'cba_ee_compat_sog' as required addon 'loadorder_f_vietnam' is not present
Skipped loading of addon 'cba_ee_compat_ws' as required addon 'data_f_lxWS' is not present

pbo check fails because tools are old, but updated inside this pr
hemmt check fails because it's still on 0.7.6

@PabstMirror PabstMirror added this to the 3.15.9 milestone Aug 20, 2023
@commy2
Copy link
Contributor

commy2 commented Aug 30, 2023

Move ee folder back into xeh folder?
https://github.com/CBATeam/CBA_A3/tree/master/addons/xeh

Next to xeh_a3, Extended_EventHandlers and CBA_Extended_EventHandlers.

Only reason it was moved out was tools problems: #1199, but without scope being a config number expression, it's no longer needed to be separate.

ee subfolders could go directly into xeh.

ee has no special significance. It's there for bwc. All its former functionality has long since dumped into xeh. I only used that name for the nobin PBO, because I didn't want to introduce another one that will eventually go out of use (once better alternative to scope exists, or the tool makers gave in to reason).

@PabstMirror
Copy link
Contributor Author

one worry is people who copy and paste mods will have an old cba_ee.pbo
but I think most people can handle that or use workshop and it shouldn't be a big problem?

@commy2
Copy link
Contributor

commy2 commented Aug 30, 2023

Afaik, xeh/ee would clobber ee.

@PabstMirror PabstMirror merged commit c760f60 into master Sep 6, 2023
8 checks passed
@PabstMirror PabstMirror deleted the xehCompats branch September 6, 2023 02:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants